Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Sat, 17 Nov 2012 18:00:16 +0000 (20:00 +0200)
committerEli Zaretskii <eliz@gnu.org>
Sat, 17 Nov 2012 18:00:16 +0000 (20:00 +0200)
commitf1cb44694e56ae42000318fe7a5303452679cb7d
tree853b0605fb1d342c749b43aee420530fe5e6ea52
parentcb6be1f40158628e4ab2ec71519a5ec855bf66f4
parent8f5f274cfa368b6943c40f59e1ea95f0ca47816b
Merge from trunk.
lisp/ChangeLog
lisp/subr.el
src/ChangeLog
src/Makefile.in
src/lisp.h
src/makefile.w32-in
src/w32proc.c